ostbuild: Fix --debug-shell
authorColin Walters <walters@verbum.org>
Thu, 9 Feb 2012 21:47:25 +0000 (16:47 -0500)
committerColin Walters <walters@verbum.org>
Thu, 9 Feb 2012 21:47:25 +0000 (16:47 -0500)
We want to reuse an existing source tree.

src/ostbuild/pyostbuild/vcs.py

index a6d2470df8c16f4b997c3cdd5987ff8117574906..adf947a81327c904b74ff991a48af98eb18b3f4d 100755 (executable)
@@ -51,8 +51,11 @@ def get_vcs_checkout(mirrordir, keytype, uri, dest, branch, overwrite=True):
     tmp_dest = dest + '.tmp'
     if os.path.isdir(tmp_dest):
         shutil.rmtree(tmp_dest)
-    if os.path.isdir(dest) and overwrite:
-        shutil.rmtree(dest)
+    if os.path.isdir(dest):
+        if overwrite:
+            shutil.rmtree(dest)
+        else:
+            return dest
     if not os.path.isdir(tmp_dest):
         run_sync(['git', 'clone', '-q',
                   '--no-checkout', module_mirror, tmp_dest])